remove para about conflicts

That was only ever relevant for the v1 upgrade!

diff --git a/doc/upgrades.mdwn b/doc/upgrades.mdwn
index 7d48547d82d42c0867bcd6b9db2d7b47c5dca055..01e0054dfa3363d73981ae029b3d8d70ea6c14d9 100644 (file)
--- a/doc/upgrades.mdwn
+++ b/doc/upgrades.mdwn
@@ -38,11 +38,6 @@ refuse to do anything. To upgrade, use the "git annex upgrade" command.
 To prevent automatic upgrades in a repository, run:
 `git config annex.autoupgraderepository false`
 
-The upgrade process is guaranteed to be conflict-free. Unless you
-already have git conflicts in your repository or between repositories.
-Upgrading a repository with conflicts is not recommended; resolve the
-conflicts first before upgrading git-annex.
-
 The upgrade process needs to write to the repository. If the original
 repository cannot be written to (due to eg being on readonly media),
 the upgrade would need to be run in a copy of the repository.